Merge branch 'master' into plot-audio