Merge pull request #2807 from sileht/master