Synchronize new Map from comen/map

Synchronize new Map from comen/map on 2014/11/19.