Fix migration code to correct route/loc info
Merge branch 'master' into gh-pages