Incorporated Duncan's changes to atomic.h
Incorporated Duncan's changes to atomic.h

scorpion007/pixie,scorpion007/pixie,eponymous/pixie,eponymous/pixie,scorpion007/pixie,eponymous/pixie,scorpion007/pixie,eponymous/pixie