Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 24 Apr 2018 06:01:21 +0000 (08:01 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 24 Apr 2018 06:01:21 +0000 (08:01 +0200)

Trivial merge