Merge remote-tracking branch 'kraxel/tags/pull-audio-20170504-1' into staging