Commit b23c206e591260bb184990fea4a8104f7b27b897

Carlos Martín Nieto 2015-02-15T05:03:51

Merge pull request #2903 from ethomson/rebase Fixups for rebase