Merge "Fix a broken boolean test found by clang."