Merge branch 'release/0.2.40' into develop
Merge branch 'master' of github.com:lucifurious/kisma into develop
rp
Merge branch 'release/0.2.41'