Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 20 Sep 2018 22:18:23 +0000 (08:18 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 20 Sep 2018 22:18:23 +0000 (08:18 +1000)

Trivial merge