Fix unsortedmap compile error on unix.
Merge remote-tracking branch 'origin/master'