1.3.5
Merge branch 'release/1.3.5' into develop
Merge remote-tracking branch 'local/develop' into develop

Conflicts:
	package.json
1.3.5-1
Merge branch 'release/1.3.5-1' into develop