Fix issue [#31160] Use of JRequest in the Users Component Controller
Update code for issue  [#31160] Use of JRequest in the Users Component Controller
Allow the ability to require a user to reset their password
Password field required if reset required
Merge remote-tracking branch 'joomla/master' into requirePasswordReset
Beez3: when elements aren't found it broke others scripts in the page
Prepare 3.3 development
Merge remote-tracking branch 'joomla/staging' into requirePasswordReset
Restore update queries
Merge remote-tracking branch 'joomla/master' into 3.3-dev
fixed bug on caching and pathway workaround
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
[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 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.