Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20160608' into staging