Merging working -> master in preparation for patch release

Patch release prompted by #492 and associated fix in #493