Merge "fix __has_attribute in visual studio"