IST-109, fixed ordinal display of ranges
Merge branch 'master' into beta