PR with force-pushed base branch

Here we go
At the time this comment was made, the diff looked like this:

![screen-shot-2014-12-01-at-11 15 34-am- 2](https://cloud.githubusercontent.com/assets/917945/5376167/780d4674-8040-11e4-9677-dd5998c6c15b.gif)