Merge from SailfishOS branch.

Plus a few adjustments