Fixed building with NaCl.
Merge remote-tracking branch 'upstream/master' into FullName