Merge branch 'xorg/master' into xorg/f/geocoding

diff --cc classes/direnum.php
Simple merge

diff --cc classes/userfilter.php
Simple merge

diff --cc classes/userfilter/conditions.inc.php
Simple merge

diff --cc modules/payment/money/paypal.inc.php
Simple merge

diff --cc modules/profile.php
Simple merge