Fix invalid iterator access
Merge remote-tracking branch 'github/build-bot-master' into bleeding-edge-master
2014.12.08-21.00