Merge branch 'release/2.0.1e' into develop

* release/2.0.1e:
  Update filesums for release
Strip surrounding whitespace too
Inline options call
Update filesums for release
Merge branch 'release/2.0.1f'

* release/2.0.1f:
  Update filesums for release
  Inline options call
  Strip surrounding whitespace too