Merge branch 'lqc-trunk' of git@stigma:platforma into lqc-trunk