Fixed #395: fixed conversion between MCOIndexSet and NSIndexSet
Merge remote-tracking branch 'upstream/master'