Commit 2ab6d2cd47a9175faa8d9915751511d9490b03b9

Vicent Marti 2014-03-06T16:08:17

Revert pull request #1997