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