development
Merge branch 'development'

Conflicts:
	phpunit.xml.dist