Merge branch 'fixtures_except_option_added' of https://github.com/Ragazzo/yii2 into Ragazzo-fixtures_except_option_added

* 'fixtures_except_option_added' of https://github.com/Ragazzo/yii2:
  filter fix
  changelog added
  changes of other pr reverted
  except option added

Conflicts:
	framework/CHANGELOG.md