Merge with djlambert master to fix symfony integration.