Merge branch '1.0'

Conflicts:
	.travis.yml

Author: wouterj

.travis.yml

@@ -33,7 +33,7 @@ matrix:
   fast_finish: true
 
 before_install:
-  - sh -c 'if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;'
+  - if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
   - composer selfupdate
   - composer require symfony/symfony:${SYMFONY_VERSION} --no-update