Merge 2.x into master

.travis.yml

@@ -44,10 +44,10 @@ matrix:
       env: COMPOSER_FLAGS="--prefer-lowest"
     - php: '7.1'
       env: SYMFONY=2.8.*
-    - php: '7.1'
-      env: SYMFONY=3.1.*
     - php: '7.1'
       env: SYMFONY=3.2.*
+    - php: '7.1'
+      env: SYMFONY=3.3.*
     - php: '7.1'
       env: SYMFONY=dev-master@dev
     - php: '7.1'

.travis/before_install_test.sh

@@ -6,6 +6,7 @@ if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then
     TRAVIS_INI_FILE="$PHP_INI_DIR/travis.ini"
     echo "memory_limit=3072M" >> "$TRAVIS_INI_FILE"
 
+
     fi
 
 sed --in-place "s/\"dev-master\":/\"dev-${TRAVIS_COMMIT}\":/" composer.json

.travis/before_script_test.sh

@@ -1,2 +1,3 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 set -ev
+