Merge pull request #2437 from rrelmy/master