Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 23 Jan 2018 01:18:46 +0000 (12:18 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 23 Jan 2018 01:18:46 +0000 (12:18 +1100)

Trivial merge