Added std namespace before C like calls for Solaris STL-port compatability.
Merge remote-tracking branch 'upstream2/master'