clean trollybranch2
Merge branch 'trollybranch2' into trollybranch
commit branch2