Merging changes from upstream
Merge pull request #5 from PerilousApricot/feature/sync-upstream-nowhitespace

Merging changes from ACCRE