Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 29 Nov 2017 05:15:21 +0000 (16:15 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 29 Nov 2017 05:15:21 +0000 (16:15 +1100)

Trivial merge