Make sure that UpdateLocker is used correctly in the future
Merge remote-tracking branch 'github/build-bot-master' into bleeding-edge-master
2014.11.17-11.00