Bad commit
Revert "Bad commit"

This reverts commit 1fa4d986e0095bb7439d8515a75de5e1393c1e80.
Revert "Revert "Bad commit""

This reverts commit 93ce2d12a532b6feeddbe84a7fa9f0b6f7e961fb.
Merge branch 'master' into Tiffanies_branch

Conflicts:
	TiffaniesTest.groovy