Merge: nitiwiki: fix multiple trails