Merge remote-tracking branch 'acl_extras/master' into 3.0

Conflicts:
	.travis.yml
	README.md
	composer.json