Merge branch 'axdev/snappy' into axdev/master

[Merge topic 'snappy-zram']