merge from mapjs
Merge branch 'master' into dropboxSpike