Merge branch 'develop'
Rewriting history for commits that were incorrectly merged
Added a deactivate method to the ParkerModule
Cleanup following interactive rebase over too many commits
Merge branch 'bug'