Merge branch 'blender2.7'
authorCampbell Barton <ideasman42@gmail.com>
Fri, 4 Jan 2019 06:08:34 +0000 (17:08 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 4 Jan 2019 06:08:34 +0000 (17:08 +1100)

Trivial merge