Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 14 May 2018 06:41:15 +0000 (08:41 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 14 May 2018 06:41:15 +0000 (08:41 +0200)

Trivial merge