Merging working -> master in preparation for patch release