Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 22 Jun 2016 22:04:19 +0000 (08:04 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 22 Jun 2016 22:04:19 +0000 (08:04 +1000)
No changes, just resolve conflicts.


Trivial merge