Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 23 May 2018 05:30:50 +0000 (07:30 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 23 May 2018 05:30:50 +0000 (07:30 +0200)

Trivial merge