Fix MMP-1287
Merge branch 'master' into 2.1

Conflicts:
	package.json