Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 15 May 2018 07:08:48 +0000 (09:08 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 15 May 2018 07:08:48 +0000 (09:08 +0200)

Trivial merge