Update sherpa to version 2.1

Backport of PR #592.