Merge remote-tracking branch 'upstream/master'

diff --cc settings/settings.php
Simple merge

diff --cc utils/setup.php
Simple merge

diff --cc website/reverse.php
Simple merge

diff --cc website/search.php
Simple merge