Works on Amazon Linux, too
Merge branch 'AWS'