Merge branch 'master' into gsoc2-audiobuf-accesses