ControllerMate 4.7.1
Merge pull request #2096 from ahbeng/controllermate

ControllerMate 4.7.1