Fixed gcc error
Merge branch 'master' into sailfishos