Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 15 Mar 2018 19:11:35 +0000 (06:11 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 15 Mar 2018 19:11:35 +0000 (06:11 +1100)

Trivial merge