#1433
Merge pull request #1441 from jpuri/master

#1433