Merge branch 'master' into v2beta

Conflicts:
	CI/ci-mac.sh
	VERSION
	src/Unittests/unittests_files.cc
6 jobs for v2beta
Status Name Job ID Coverage
  Test
passed clang-c++11 #5079
Linux

00:02:22

passed clang-c++98 #5081
Linux

00:01:39

passed gcc-c++11 #5078
Linux

00:03:44

passed gcc-c++98 #5080
Linux

00:02:26

passed macos-c++11 #5082
Apple

00:02:17

passed macos-c++98 #5083
Apple

00:02:08