20141026merge