Merge branch 'master' into oh_canada

Too defunct, rebase from Holmans