vchoi_fork

[svn-r27842] Description:
    Sync w/trunk.

Tested on:
    MacOSX/64 10.10.5 (amazon) w/serial & parallel (although not CMake)
    (h5committest not required on this branch)