Bump version to s36.1
Merge pull request #1715 from reciprocity/feature/version-sprint-36.1

Bump version to s36.1