Again, with correct bash if syntax
Merge branch 'lvm' into braintree