CommandBridge sync: adapt to API changes (ready for testing)
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/nursix/eden