Merge pull request #1936 from mmaraya/master