Add support for cmpxchg
Merge branch 'master' into jenkins