Update check
Merge commit 'd0e03d7' into osxfuse-2
Merges with origin/osxfuse-2