Merge branch 'blend'
woot
yeah