Merge "(bug 36400) API: Fix sorting for iwlinks, langlinks"