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