Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 8 Aug 2018 03:14:07 +0000 (13:14 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 8 Aug 2018 03:14:07 +0000 (13:14 +1000)

Trivial merge