Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 26 Apr 2018 12:36:00 +0000 (14:36 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 26 Apr 2018 12:36:00 +0000 (14:36 +0200)

Trivial merge