Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 20 Dec 2018 06:53:12 +0000 (17:53 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 20 Dec 2018 06:53:12 +0000 (17:53 +1100)

Trivial merge