voxpelli Merge pull request #282 from standard/prerelease-15