Merge pull request #1954 from omnicate/master