gustafn
committed
on 12 Aug 15
- backport of item_index fixes from HEAD/oacs-5-9