Merge branch 'openid'
Merge branch 'master' of https://github.com/pitikov/alpsite
Merge branch 'layouts'