Merge 3.2/master into 3.3/develop

Contains a replacement of an occurance of "kohanaphp.com" with "kohanaframework.org"