Fix bug #9296. The key may be multiple keys.

(cherry picked from commit 080a4d84e295db1f2c2589af46fcfa981a716406)
Merge remote-tracking branch 'github/build-bot-2.1.x' into bleeding-edge-2.1.x
2014.10.16-21.00