Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 29 Aug 2018 15:05:46 +0000 (01:05 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 29 Aug 2018 15:05:46 +0000 (01:05 +1000)

Trivial merge