RT @phillip_webb: Merging that long lived feature branch in with those regular commits…