Merge branch 'atomicparsley' (closes #2436)