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

Trivial merge