Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 21 Apr 2018 18:17:41 +0000 (20:17 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 21 Apr 2018 18:17:41 +0000 (20:17 +0200)

Trivial merge