Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 24 Nov 2018 21:06:22 +0000 (08:06 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 24 Nov 2018 21:06:22 +0000 (08:06 +1100)

Trivial merge