Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 19 Sep 2018 02:05:08 +0000 (12:05 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 19 Sep 2018 02:05:08 +0000 (12:05 +1000)

Trivial merge