Update maps package. r=me, a=vingtetun
Auto-merge from branch 'master'