(svn r26574) -Fix [FS#6006]: Don't reset current order wait time if it's timetabled.
-Change [FS#5995]: Add an assert to catch underflowing action counts.