Merge pull request #2212 from unxed/ctrl_yo