First draft
Merge branch 'master' of git://github.com/ComHem/developer-test