Merge remote-tracking branch 'origin/1.3'

Conflicts:
	core/src/doc/lib/api.rst