Merge branch 'master' of github.com:piwik/piwik

tests/travis/initiate_ui_tests.sh

 #!/bin/bash
 
 # initiate UI tests before starting system tests for php 5.5
-if [ "$TEST_SUITE" != "SystemTests" ] || [[ "$TRAVIS_PHP_VERSION" != 5\.5* ]]; then
+if [ "$TEST_SUITE" != "SystemTests" ] || [[ "$TRAVIS_PHP_VERSION" != 5\.4* ]]; then
     echo "Not initiating UI tests (\$TEST_SUITE = $TEST_SUITE, \$TRAVIS_PHP_VERSION = $TRAVIS_PHP_VERSION)."
     exit
 fi
@@ -29,4 +29,4 @@ git remote set-url origin "https://piwik-auto-commit-bot:$PIWIK_AUTOMATION@githu
 if ! git push origin $UI_BRANCH 2> /dev/null; then
     echo "Failed to push!"
     exit 1
-fi
+fi
\ No newline at end of file