Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 13 Sep 2018 07:56:32 +0000 (17:56 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 13 Sep 2018 07:56:32 +0000 (17:56 +1000)

Trivial merge