Start work on 0.8 upgrade
Blaze works
Merge branch 'master' into blaze

Conflicts:
	smart.lock