Merge "Doxygen script update" into devel/master