3.3/master

Fix for kohana 3.3