Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 6 Dec 2017 05:51:37 +0000 (16:51 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 6 Dec 2017 05:51:37 +0000 (16:51 +1100)

Trivial merge