Fixed: Argument "yes" isn't numeric in numeric eq (==)
Merge branch '1.1.x' into stable