Fix feature checks to use correct __ATOMIC flags
Make valgrind happy
Fix feature checks to use correct __ATOMIC flags
Make valgrind happy
Merge branch '2.6'