Removed invalid reference
Minor documentation update
Misc. source cleanup
Merge branch 'master' into dev
TEST: Investigating test failure with GCC on Linux.