Merge branch 'hotfix/connery/accelerometer'
Merge branch 'master' into develop