Board Thread:Wiki-Related Discussion/@comment-2153169-20150201203847/@comment-15736398-20150209060427

Follow Wikipedia's lead (which in turn relies on ABC.Com). It's the most accurate way to represent things as they are, taking into account both Production Numbers and the order in which the episodes will appear on the DVDs.