Merge pull request #40 from edx/dhm/acid_aside

Dhm/acid aside