Merge branch 'testing' into 0.9.x

Conflicts:
	actions/apioauthauthorize.php

diff --cc actions/apioauthauthorize.php
Simple merge

diff --cc lib/api.php
Simple merge

diff --cc lib/default.php
Simple merge

diff --cc lib/util.php
Simple merge