Merge pull request #1242 from phausler/objc_bool_import_fixes