Allow for re-init.
Merge branch 'master' of https://github.com/taylor-project/taylor-picketlink-2.0.3