Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 5 Apr 2017 01:40:17 +0000 (11:40 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 5 Apr 2017 01:40:17 +0000 (11:40 +1000)

Trivial merge