Merge remote-tracking branch 'origin/DEROPAPY' into DEROPAPY

# Conflicts:
#	Prototypes/DEROPAPY/CropCoeffs.xlsx
#	Prototypes/DEROPAPY/Deropapy.apsimx

Models/Management/BiomassRemovalEvents.cs

@@ -219,6 +219,18 @@ private void OnPhenologyDefoliate(object sender, BiomassRemovalEventArgs e)
             }
         }
 
+        [EventSubscribe("PhenologyPrune")]
+        private void OnPhenologyPrune(object sender, EventArgs e)
+        {
+            Remove();
+        }
+
+        [EventSubscribe("PhenologyHarvest")]
+        private void OnPhenologyHarvest(object sender, EventArgs e)
+        {
+            Remove();
+        }
+
         private void LinkCrop()
         {
             if (this.Parent == null)