Upgrade to symfony components v2.3