Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 8 Dec 2017 01:59:51 +0000 (12:59 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 8 Dec 2017 01:59:51 +0000 (12:59 +1100)

Trivial merge