Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 28 Aug 2017 04:25:10 +0000 (14:25 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 28 Aug 2017 04:25:10 +0000 (14:25 +1000)

Trivial merge