Merge branch 'master' into dev
Merge branch 'hotfix-resizer' into dev
sorting migrations so they run in order on ubuntu
noting the changes in v0.7.11
updating the version number
Merge branch 'release-0.7.11'