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

No differences found