Merge pull request #2212 from jpuri/master

#1815