Commit 9f802b5b26f070e79a2bcd4c010d85106452bbb7

Vicent Martí 2013-12-03T07:40:30

Merge pull request #1983 from ethomson/revert Bare naked merge and rebase