Merge branch 'master' into jgrpp

# Conflicts:
#	CMakeLists.txt
#	COMPILING.md
#	src/console.cpp
#	src/console_cmds.cpp
#	src/console_internal.h
#	src/rev.cpp.in

src/string_func.h

@@ -54,6 +54,7 @@ bool strtolower(char *str);
 bool strtolower(std::string &str, std::string::size_type offs = 0);
 
 bool StrValid(const char *str, const char *last);
+void StrTrimInPlace(char *str);
 
 /**
  * Check if a string buffer is empty.