Removed __ prefix from include guard.
Merge branch 'cpp-netlib.master' into update
Merge branch 'update' into update.macosx