Merge pull request #1854 from jollaman999/master