Ensure we are sudo'ing and bail if mount failed
Lock update
Don't track the lock file
Merge commit '67eb57bd1ab4cdb3dc588236b7275a580bb9b6cd' into develop