Merge "Use hasmntopt(3) rather than reinventing the wheel."