Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 22 May 2018 15:24:32 +0000 (17:24 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 22 May 2018 15:24:32 +0000 (17:24 +0200)

Trivial merge