Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 15 Sep 2017 12:44:07 +0000 (22:44 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 15 Sep 2017 12:44:07 +0000 (22:44 +1000)

Trivial merge