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