1.7.10 commit of I-still-can't-do-any-branches