Merge remote-tracking branch 'origin/cleanup/shellcheck' into cleanup/shellcheck

# Conflicts:
#	automated install/basic-install.sh
This commit is contained in:
Dan Schaper
2017-01-09 00:17:15 -08:00

Diff Content Not Available