BUG: Fixed a bug handling overloaded functions in doxygen
Merging master back in