When you commit security fixes, please don't bundle them with feature extensions, and 
please *do* backport them yourself.