Merge branch 'master' into wps-sfire-merge