Merge from the stackforge
Merge auth_file