Conditional required added
.only removed
Merge pull request #2247 from nelisbijl/conditionalrequired

Conditionalrequired
Merge remote-tracking branch 'upstream/master'