Fix initialization order
Merge remote-tracking branch 'github/build-bot-master' into bleeding-edge-master
2014.12.21-10.00