Commits

[svn-r27062] Description: Merged recent trunk changes. Tested on: MacOSX/64 10.10.3 (amazon) w/parallel & serial (h5committest not required on this branch)
[svn-r27062] Description: Merged recent trunk changes. Tested on: MacOSX/64 10.10.3 (amazon) w/parallel & serial (h5committest not required on this branch)