Merge branch 'master' into sailfish-port