Merge branch 'mt-directory-fix' into 'develop'

Incorrect directory is used during commit hash generation

See merge request !19