Merge pull request #2236 from simontretter/master