Add unit test
phpdoc
Coding style
Fix undefined variable
Merge branch 'master' into imp_6_1

Conflicts:
	imp/lib/Compose.php