Packages from the vendor zsolt

zsolt/guard-clauses