Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 12 Sep 2018 06:28:50 +0000 (16:28 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 12 Sep 2018 06:28:50 +0000 (16:28 +1000)

Trivial merge