Commit 7636f740b32fcef4888cc3854446f1f98bfc8fb3

Carlos Martín Nieto 2015-04-21T14:38:23

Merge pull request #2992 from ethomson/rebase_fixes Rebase fixes