Merge from twitter/scalding