Merge branch '3cl' into 1.0.x

diff --cc actions/all.php
Simple merge

diff --cc actions/public.php
Simple merge

diff --cc actions/showgroup.php
Simple merge

diff --cc lib/action.php
Simple merge