Merge pull request #1854 from svedm/master