Merge from HEAD to allow automatic Doxygen generation.