Fix infinite recusion issue
merging fixes

Merge branch 'openid' of github.com:sociam/indx into unstable