Merge branch 'blender2.7'
authorCampbell Barton <ideasman42@gmail.com>
Mon, 28 Jan 2019 11:27:00 +0000 (22:27 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 28 Jan 2019 11:27:00 +0000 (22:27 +1100)

Trivial merge