Merge branch 'zecke/mgcp-transactions'