refs #366, refs #375, refs #401, fix merge on master