Merge from klout/brickhouse