Oran Kelly - 2011-10-29

Fix has been committed to the 0.3.x branch along with a unit test.