Merge from twitter/storehaus