Disable swap
Merge remote-tracking branch 'upstream/master' into disable-swap
Merge pull request #417 from blueboxgroup/disable-swap

Disable swap