performance

Merge branch 'master' of https://bitbucket.hdfgroup.org/scm/~frank.willmore/performance into feature-subfiling

fixed Conflicts:
	seism-core/src/Makefile.jelly