* 2.3: [travis] Add some comments changed operator from and to && Conflicts: src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php