Merge remote-tracking branch 'origin/new/FTL-binary' into new/FTL-binary

# Conflicts:
#	automated install/basic-install.sh
pull/1244/head
Dan Schaper 8 years ago
commit d76e761d0b
No known key found for this signature in database
GPG Key ID: 572E999E385B7BFC

Diff Content Not Available