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

Trivial merge