Maintenace commit
Merge branch 'hndshkif' of https://github.com/stickymann/halaya into hndshkif