Began version 0.8.7
Merge branch 'master' into sailfishos
Began version 0.8.7