Merging in lost change from release 0.8.2