Merge branch 'master' into html5-audio-wip