Merged 6bcd0596e99 into master

Accidently fixed issue #65 while still in dev branch for 3.03 so I've
merged that fix into master.