Merge pull request #985 from qwerdy/master