add boolean to *symbol-map* to avoid javascript keyword conflict
Merge branch 'master' into 1.5.2-dev

* master:
  add boolean to *symbol-map* to avoid javascript keyword conflict