Merge branch 'master' into hacking-cc1120