Merge branch 'master' of review:profile/ivi/neard