Required commit before merging master

This was done to clear up an error message when trying to merge from
the master. The only file listed is *.xcuserstate???