Trying out L5
Minor bug fixes
Merge branch 'dev' into 1.x

Conflicts:
	composer.json