Merge branch 'master' into 'gcorti-master-patch-18052'

# Conflicts:
#   lhcbnightlyconf/Gauss.py

lhcbnightlyconf/Gauss.py

@@ -322,20 +322,6 @@ gaussLamarr.projects.append(
     ]))
 slots.append(gaussLamarr)
 
-# Slot for Gauss with fast Calorimeter development
-gaussFastCalo = create_sim_slot(
-    'lhcb-gauss-fast',
-    'Development build of Gauss indentical to lhcb-gauss-dev to check fast calorimeter options',
-    platforms=SIM10_PLATFORMS)
-gaussFastCalo.projects.append(
-    DBASE(packages=[
-        Package(
-            'FastCaloSimData', 'HEAD', checkout=('git', {
-                'merges': 'all'
-            }))
-    ]))
-slots.append(gaussFastCalo)
-
 # Slot for Gaussino and Gauss-on-Gaussino
 gaussino = create_gaussino_slot(
     'lhcb-gaussino',