WIP
Current work checkpoint. See diff for details.
rp
Merge branch 'release/0.2.53'
Merge branch 'master' of github.com:lucifurious/kisma