test DEV
test DEV2
test DEV2
test DEV1
Merge branches 'DEV-1' and 'DEV-2'

Conflicts:
	src/lintfail.php