Fix backwards brace
Merge branch 'allow-multiple-channels' into symfony2.1