Andrew Heard - 2011-06-03

Corresponds to internal ticket #15.