Commits

Quincey Koziol committed 040d7358870
[svn-r28034] Description: Merge r27710 from trunk to branch. (And some other minor cleanups) Tested on: MacOSX/64 10.10.5 (amazon) w/serial (h5committest not required on this branch)
[svn-r28034] Description: Merge r27710 from trunk to branch. (And some other minor cleanups) Tested on: MacOSX/64 10.10.5 (amazon) w/serial (h5committest not required on this branch)