Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2018 09:10:09 +0000 (11:10 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2018 09:10:09 +0000 (11:10 +0200)

Trivial merge