Merge branch 'master' into ChaiScript_5_0_CPP_11

Conflicts:
	src/main.cpp

src/main.cpp

@@ -31,10 +31,13 @@ char* readline(const char* p)
   return std::cin.eof() ? NULL : mystrdup(retval.c_str());
 }
 
+
 void add_history(const char*){}
 void using_history(){}
 #endif
 
+
+
 void *cast_module_symbol(std::string (*t_path)())
 {
   union cast_union