Merge branch 'master' into genivi_release