add defer
Merge branch 'devel-install' of https://github.com/thesues/catkeeper into devel-install