Fix typo spotted by Hartmut.
Fix grammar error spotted by Sian Mountbatten
Merge remote-tracking branch 'github/build-bot-2.1.x' into bleeding-edge-2.1.x
2014.10.25-12.00