Merge branch 'develop' into feature/issue-690-tag-v2.3.0

Conflicts:
	makefile

make/tests

@@ -280,20 +280,20 @@ test-distributions: src/test/unit-distribution
 test-models:
 	@echo ''
 	@echo 'These tests are now in the CmdStan repository. Run this from'
-	@echo 'the CmdStan directory:'
+	@echo 'the CmdStan home directory:'
 	@echo ''
 	@echo '  "> make src/test/models"'
 	@echo ''
-	$(error Tests have moved to the CmdStan repository. Run "> make src/test/models")
+	@exit 1
 
 test-bugs:
 	@echo ''
 	@echo 'These tests are now in the CmdStan repository. Run this from'
-	@echo 'the CmdStan directory:'
+	@echo 'the CmdStan home directory:'
 	@echo ''
 	@echo '  "> make src/test/models/bugs_examples"'
 	@echo ''
-	$(error Tests have moved to the CmdStan repository. Run "> make src/test/models/bugs_examples")
+	@exit 1
 
 
 .PHONY: test-all