Rebase
Merge branch '3.2' of github.com:pocesar/kohana-modules into 3.2