Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 28 Apr 2017 17:23:54 +0000 (03:23 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 28 Apr 2017 17:24:03 +0000 (03:24 +1000)

Trivial merge