Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 3 May 2018 18:24:44 +0000 (20:24 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 3 May 2018 18:24:44 +0000 (20:24 +0200)

Trivial merge