Merge js_mac branch of ricardoquesada's repo.