Merge branch '3.2/develop' into 3.2/master
Resolves #4814 by removing duplicate line of code.
Merge pull request #61 from paulsschwarz/3.2/develop

Resolves #4814 by removing duplicate line of code.
Merge develop for new release
Merge pull request #70 from kohana/3.2/master

Merge 3.2/master into 3.3/develop

Closes #70, merged manually due to github merge problem