2.1.3
Merge remote-tracking branch 'local/develop'

Conflicts:
	test/tasks.js