Merging working -> master in preparation for minor release