Merge pull request #2191 from Ansuel/zram