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

Trivial merge