Merge pull request #1181 from h3xx/master