Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Doxygenate and style dsm.c

One file a day... this'll take a while!
Merge remote-tracking branch 'upstream/master'
Remoce C++ style Doxygen comments

Replace C++ style comments with C comments
Merge pull request #359 from jean-m-cyr/master

Doxygenate and style dsm.c