Another attempt at properly fixing the fatal stephen ran into
Merge branch 'v1' of github.com:methnen/bsocial-comments into v1