version bump
Merge branch 'master' into dev
added test from hyst issue