Update to version 0.8.4 of scss package
Increment version
Merge branch 'release/v3.1.1-4'