Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 7 Sep 2017 04:33:59 +0000 (14:33 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 7 Sep 2017 04:33:59 +0000 (14:33 +1000)

Trivial merge