Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 14 Aug 2017 02:13:55 +0000 (12:13 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 14 Aug 2017 02:13:55 +0000 (12:13 +1000)

Trivial merge