Merge remote-tracking branch 'joomla/master' into 3.3-dev
Raise minimum supported PHP version to 5.3.10
Improvement to result display in smart search

Results are truncated to a number of characters from the begining, so unless your query falls there, you won't see it in the results view, which may confuse the user who did the search.

This improves the truncation so that characters around the search query are shown. If it was the last word in the article, then chosen amount of characters before it will be shown (or after if it was at the begining), otherwise it aims for the search query to be in the middle of excerpt for optimal understanding.

If the match was not in the body of the description, then the first XXX characters will be shown like before.

Maybe such function would be useful to add to JHtml.string?
Update default_result.php
Merge branch 'staging' into 3.3-dev
Fixed mod_finder JavaScript error

com_finder/autocompleter.js requires Mootools
[bug] Regression: Add deprecating support for removed components getActions method. Fix #3061
[CODE STYLE] Several Codestyle fixes. Fix #3028, Fix #3029, Fix #3030, Fix #3031, Fix #3032, Fix #3033, Fix #3034, Fix #3035, Fix #3036, Fix #3037, Fix #3040, Fix #3041, Fix #3042, Fix #3043
Pleasing Jenkins
Update robots.txt.dist

Remove /images from robots.txt
Update error.php

<?php if ((!$statusFixed) && ($this->countModules('status'))) : ?>
needs to be changed by
<?php if ((!$statusFixed) && ($this->getInstance()->countModules('status'))) :?>

$this is, at that point, instantiated to JDocumentError which has not countModules method throwing an error.
[fix] Ignore System tests config file

This file is the config file for testing it should be ignored by the repo because is different in every machine
Improved loading JHtml::_('behavior.framework') of mod_finder
Merge remote-tracking branch 'joomla/staging' into requirePasswordReset
Batch allows the current user to flag their account
Merge remote-tracking branch 'joomla/staging' into 3.3-dev
Add valid_elements option to TinyMCE plugin
Fix wrong results returned by isEnabled

When language filter plugin is disabled and language filter is enabled in code using JFactory::getApplication()->setLanguageFilter(true) calling JLanguageAssociations->isEnabled causes notices and fatal errors and returns wrong result if item associations are in fact disabled.

What happens is that JPluginHelper::getPlugin returns empty array when certain plugin is disabled and since there is no params to be passed to JRegistry and $enabled gets default value.
Merge remote-tracking branch 'joomla/staging' into 3.3-dev
Make JEventDispatcher compatible with HHVM

According to HHVM inconsistencies guildline, "Under Zend PHP, foreach by value will modify the array's internal cursor under certain circumstances. Under HipHop VM, foreach by value will never modify the array's internal cursor.

Moving end() from above key() function to below it also make the code easier to understand as the behavior of foreach with array cursor is complicated to understand.