clean up event listeners
Merge branch 'refs/heads/master' into 2.1