Merge branch 'jgrpp' into save_ext_spp

Conflicts:
	src/saveload/order_sl.cpp

src/saveload/extended_ver_sl.h

@@ -36,6 +36,7 @@ enum SlXvFeatureIndex {
 	XSLFI_INFRA_SHARING,                          ///< Infrastructure sharing patch
 	XSLFI_VARIABLE_DAY_LENGTH,                    ///< Variable day length patch
 	XSLFI_ORDER_OCCUPANCY,                        ///< Running average of order occupancy
+	XSLFI_MORE_COND_ORDERS,                       ///< More conditional orders patch
 
 	XSLFI_RIFF_HEADER_60_BIT,                     ///< Size field in RIFF chunk header is 60 bit
 	XSLFI_HEIGHT_8_BIT,                           ///< Map tile height is 8 bit instead of 4 bit, but savegame version may be before this became true in trunk