Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20150325' into staging