Bug fixes (not pushed to dev site)
Merge branch 'framework4' of github.com:the-spiller/Midway into framework4