Merge branch 'settings' into harmattan