Fixup for rebase of hausdorff/ser_dev onto nathanmarz/master