Merge pull request #743 from Arantor/release-2.1

! Rework hook filtering to be based on an onchange event rather than an ...