4 files changed, 5 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 0ddd98b5d8..f296f10230 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ before_script:
   - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi"
   - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi"
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
+  - pyrus set auto_discover 1
   - pyrus install --force phpunit/DbUnit
   - phpenv rehash
   - cd phpBB
diff --git a/README.md b/README.md
index 0febad397d..78aa306bed 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![phpBB](http://www.phpbb.com/theme/images/logos/blue/160x52.png)](http://www.phpbb.com)
+[![phpBB](https://www.phpbb.com/theme/images/logos/blue/160x52.png)](http://www.phpbb.com)
 
 ## ABOUT
 
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index 1a3bbe23db..288c0b5940 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -500,7 +500,7 @@ class phpbb_search_fulltext_sphinx
 			}
 			else
 			{
-				trigger_error($this->user->lang('SPHINX_SEARCH_FAILED', $this->user->lang('SPHINX_SEARCH_ERROR_LOG')));
+				trigger_error($this->user->lang('SPHINX_SEARCH_FAILED_LOG'));
 			}
 		}
 
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 5eea6044bc..71cbec4b41 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -105,8 +105,8 @@ $lang = array_merge($lang, array(
 	'SORT_FORUM'				=> 'Forum',
 	'SORT_POST_SUBJECT'			=> 'Post subject',
 	'SORT_TIME'					=> 'Post time',
-	'SPHINX_SEARCH_FAILED'		=> 'Search failed. %s',
-	'SPHINX_SEARCH_ERROR_LOG'	=> 'The error information has been logged.',
+	'SPHINX_SEARCH_FAILED'		=> 'Search failed: %s',
+	'SPHINX_SEARCH_FAILED_LOG'	=> 'Sorry, search could not be performed. More information about this failure has been logged in the error log.',
 
 	'TOO_FEW_AUTHOR_CHARS'	=> array(
 		1	=> 'You must specify at least %d character of the authors name.',