Commit some changes from the merge from mono master upstream. Somehow were marked as uncommited on the working copy.