Merge branch 'master' of git.esilibrary.com:migration-tools