Merge branch 'release/1.3.5' into develop
slashy madness
bump 1.3.6
Merge branch 'release/1.3.6'