Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 19 Feb 2018 04:59:20 +0000 (15:59 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 19 Feb 2018 04:59:20 +0000 (15:59 +1100)

Trivial merge