make regexp output compatible with clojurescript
Merge branch 'master' into 1.5.2-dev

* master:
  make regexp output compatible with clojurescript