WIP
Current work checkpoint. See diff for details.
rp
Merge branch 'release/0.2.53'
Merge tag '0.2.53' into develop

release/0.2.53
Merge branch 'develop' of github.com:lucifurious/kisma into develop