Merge pull request #1595 from am11/master

Bundle: Fixes condition (#1591)
CSS: Removed snippets

They are included in Update 4
Merge pull request #1599 from am11/master

Validators: Code refactoring