Commits

[svn-r25926] Description: Merge w/trunk, to r25925. Tested on: MacOSX/64 10.10.1 (amazon) w/serial & parallel (h5committest not required on this branch)
[svn-r25926] Description: Merge w/trunk, to r25925. Tested on: MacOSX/64 10.10.1 (amazon) w/serial & parallel (h5committest not required on this branch)