@Zeelot: voilà https://github.com/kohana/core/pull/463