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

Trivial merge