Merge branch 'vibrationrecovery' into harmattan