Enhancements to the Siikir migrator
Merge branch 'master' into kirsle.net