Track my tweaks to GD (http://dev.kohanaframework.org/issues/4735)