This commit was SVN r1469.
to prevent conflicts w/ external libraries/headers This commit was SVN r1467.
This commit was SVN r1192.