Merge branch 'testing' into 0.9.x

diff --cc actions/block.php
Simple merge

diff --cc actions/deleteuser.php
Simple merge

diff --cc actions/groupblock.php
Simple merge

diff --cc lib/util.php
Simple merge