Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 4 May 2018 06:39:43 +0000 (08:39 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 4 May 2018 06:39:43 +0000 (08:39 +0200)

Trivial merge