Build 156 failed due to 2.6 not supporting dict comprehensions - hopefully fixed