Commits
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit '5d94490e38eae88c5180c6ce1b3f74d82f1dd600': Fix 2010 compile issues
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit '5d94490e38eae88c5180c6ce1b3f74d82f1dd600': Fix 2010 compile issues