Merge branch 'master' into newclass

Conflicts:
	LuaHDF5.lua