Merge remote-tracking branch 'upstream/master'

diff --cc lib/lib.php
Simple merge

diff --cc sql/functions.sql
Simple merge

diff --cc utils/setup.php
Simple merge

diff --cc utils/update.php
Simple merge

diff --cc website/reverse.php
Simple merge