To prepare for doxygen, ignoring doxygen output files
Merge remote-tracking branch 'origin/master'