Fix merge error
Merge branch 'master' of github.com:jpullen/html5-hardened
Allow for resubscriptions