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