Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 11 Dec 2018 03:05:16 +0000 (14:05 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 11 Dec 2018 03:05:16 +0000 (14:05 +1100)

Trivial merge