Update master branch from upstream

BugFix: displacements using incorrect module