Merged with master and added Symfony version 2.4