Updated version and changelog.
Merge branch 'release/v1.3.6' into develop