Merge pull request #368 from shadlaws/kohana_3

Kohana 3