Merge pull request #1057 from lextm/master