Merge remote-tracking branch 'pnacl/master' into incoming