Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 1 Nov 2018 05:20:52 +0000 (16:20 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 1 Nov 2018 05:20:52 +0000 (16:20 +1100)

Trivial merge