Andrew, I believe that the latest merge fixed this problem. At least I can't reproduce it anymore. Could you try bootstrapping again? Thanks. Diego.