Merge master into gh-pages to fix web audio demo.