Merged latest commits in MongoYii