Merge branch '3.2/develop' of http://github.com/kohana/core into 3.2/develop