Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 25 Jul 2017 10:53:10 +0000 (20:53 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 25 Jul 2017 10:53:10 +0000 (20:53 +1000)

Trivial merge