Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2018 07:05:40 +0000 (17:05 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2018 07:05:40 +0000 (17:05 +1000)

Trivial merge