Merge branch 'upstream'

diff --cc fai/config/class/FAIBASE.var
index 324084eeea1a3d5c75c980a9ee25552b604617c0,31120399bc94cb7a4c92e596bf5ca1b7825973c8..dc507c77faa2b23e133ab46443036ffd11a6bddc
--- 1/fai/config/class/FAIBASE.var
--- 2/fai/config/class/FAIBASE.var
+++ b/fai/config/class/FAIBASE.var
@@@ -13,5 -14,9 +13,5 @@@ TIMEZONE=US/Easter
  # errors in tasks greater than this value will cause the installation to stop
  STOP_ON_ERROR=700
  
- # set parameter for install_packges(8)
+ # set parameter for install_packages(8)
  MAXPACKAGES=800
 -
 -# a user account will be created
 -username=demo
 -USERPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'

diff --cc fai/config/scripts/DEBIAN/40-misc
Simple merge