Merge "Neko: Sort the kitties" into nyc-mr1-dev