Fix key code
Document fix
typo
Merge remote-tracking branch 'github/build-bot-2.1.x' into bleeding-edge-2.1.x
2014.10.10-17.00