Merge branch 'stringhelper-truncate' of github.com:Alex-Code/yii2 into Alex-Code-stringhelper-truncate

Conflicts:
	framework/CHANGELOG.md