Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 24 Nov 2017 03:30:36 +0000 (14:30 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 24 Nov 2017 03:30:36 +0000 (14:30 +1100)

Trivial merge