Merge branch 'blender2.7'
authorCampbell Barton <ideasman42@gmail.com>
Tue, 15 Jan 2019 13:28:46 +0000 (00:28 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 15 Jan 2019 13:28:46 +0000 (00:28 +1100)

Trivial merge