Make ActsAsTenant.with_tenant return the block value instead of the tenant
Merge branch 'master' into remove_validation