Commit 006d4f031a30dd04f5bb9c3d1daca187ef6b7f1e

Behdad Esfahbod 2018-08-01T13:59:31

[atomic] Some more minor tweaks