Fix bug #9296. The key may be multiple keys.
Update comment.
Merge remote-tracking branch 'github/build-bot-master' into bleeding-edge-master
2014.10.16-21.00