Merge pull request #634 from mjanda/master
authorDan Vanderkam <danvdk@gmail.com>
Fri, 26 Jun 2015 16:25:18 +0000 (12:25 -0400)
committerDan Vanderkam <danvdk@gmail.com>
Fri, 26 Jun 2015 16:25:18 +0000 (12:25 -0400)
Fix previous callbacks


Trivial merge