Merge pull request #1283 from sigmavirus24/master

Closes #1280