Merge branch '1.7.x'

diff --cc .travis.yml
index 40382a3eb46792f4f04d036caf7ef482d34bae66,0731274f241d8b0ab19175bacb2257b47ffd56d4..234bf35f6a1dcf93b087bf0ead8da7a0fb596d9f
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -18,22 -20,28 +19,29 @@@ matrix
      fast_finish: true
      include:
          - os: linux
-           dist: bionic
++          dist: xenial
            compiler: gcc
-           env: BUILD_TYPE=normal BUILD_WITH=cmake COVERAGE=gcov
+           env: BUILD_TYPE=normal BUILD_WITH=cmake
          - os: linux
            compiler: gcc
-           env: BUILD_TYPE=normal BUILD_WITH=autoconf COVERAGE=gcov
+           env: BUILD_TYPE=normal BUILD_WITH=autoconf
          - os: linux
            compiler: clang
-           env: BUILD_TYPE=asan BUILD_WITH=cmake COVERAGE=gcov
+           env: BUILD_TYPE=asan BUILD_WITH=cmake
          - os: linux
            compiler: clang
-           env: BUILD_TYPE=tsan BUILD_WITH=cmake COVERAGE=gcov
-         - os: osx
-           osx_image: xcode8.3 # macOS 10.12
-           compiler: clang
-           env: BUILD_TYPE=normal BUILD_WITH=cmake COVERAGE=llvm
+           env: BUILD_TYPE=tsan BUILD_WITH=cmake
+           # TODO: enable
+           # - os: linux
+           #   compiler: clang
+           #   env: BUILD_TYPE=msan BUILD_WITH=cmake
+           # - os: linux
+           #   compiler: clang
+           #   env: BUILD_TYPE=ubsan BUILD_WITH=cmake
+         - os: linux
+           compiler: gcc
+           env: BUILD_TYPE=normal BUILD_WITH=cmake
+           arch: arm64
          - os: osx
            osx_image: xcode9.3 # macOS 10.13
            compiler: clang

diff --cc test/CMakeLists.txt
Simple merge