Miscellaneous fixes.
Merge branch 'master' of https://github.com/mschurr/framework.git