Fix a couple of compiler warnings
Merge remote-tracking branch 'github/build-bot-2.1.x' into bleeding-edge-2.1.x
2014.12.08-09.00