Merge commit 'origin/master' into maemo-test