Removed P99 from Doxygen -- preprocessor hangs.
Merge branch 'master' into collection