Merge branch 'master' into non-interactive-aws-install Conflicts: doc/installation.md Fix merge mess in installation.md
* Remove trailing whitespace * Converts hard-tabs into two-space soft-tabs * Remove consecutive blank lines