Merging to allow further testing of MEGHDF5 support.
This will create a new commit in order to revert the existing changes.
