Merging branch/2013-06-05/diag to eliminate the "diag" system.  Hurrah!