fixes for 0.0-1978 need to validate if this is a bug in clojurescript
Merge remote-tracking branch 'origin/master'