Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 28 Nov 2018 21:55:34 +0000 (08:55 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 28 Nov 2018 21:55:34 +0000 (08:55 +1100)

Trivial merge