Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 14 Jan 2018 06:29:38 +0000 (17:29 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 14 Jan 2018 06:29:38 +0000 (17:29 +1100)

Trivial merge