Merge branch 'master' into v2beta

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

00:02:22

passed #5081
Linux
clang-c++98

00:01:39

passed #5078
Linux
gcc-c++11

00:03:44

passed #5080
Linux
gcc-c++98

00:02:26

passed #5082
Apple
macos-c++11

00:02:17

passed #5083
Apple
macos-c++98

00:02:08