Play nice with other hooks

colemanw requested to merge github/fork/colemanw/bhfe into master Apr 14, 2014