Merge 3.x into 3.next#324

dereuromark merged 2 commits into

3.nextcakephp/authorization:3.nextfrom

merge-3.x-into-3.nextcakephp/authorization:merge-3.x-into-3.nextCopy head branch name to clipboard