Merge branch 'master' into sailfishos
Merge branch 'sailfishos' of github.com:Meecast/meecast into sailfishos