updated for 1.0.8.19
Merge branch 'master' of https://github.com/aroundthfur/sailfish