Merge remote-tracking branch 'github.abs/master' into async-integration

Makefile

@@ -43,7 +43,7 @@ ebin/%.beam : src/%.erl
 	$(ERLC) $(ERLC_FLAGS) -o $(dir $@) $<
 
 ebin/%.app : src/%.app.src Makefile
-	sed -e s/git/\"$(VERSION)\"/g $< > $@
+	sed -e 's|git|\"$(VERSION)\"|g' $< > $@
 
 test_ebin/%.beam : test_src/%.erl
 	$(ERLC) $(ERLC_FLAGS) -o $(dir $@) $<