Merge Anne's funky commit.

:P