Merge tag '7.2.0' into merge-oae-7.2.0

v7.2.0

Conflicts:
	.travis.yml
	package.json