Merge remote-tracking branch 'origin/master' into pr/506

Conflicts:
	Yii.gitignore