Prune old branch.sql
Append old branch.sql to master
Merge branch 'master' into homepage-updater-fixes

Conflicts:
	branch.sql