Merge remote branch 'remotes/apmon/openID' into openID