Merge remote-tracking branch 'google/develop' into release
Merge remote-tracking branch 'google/develop' into release
Bump version to 2.1.1.
Add NEWS of release version 2.1.1.
Set CPACK_PACKAGE_ARCHITECTURE to darwin on Mac OS.
Merge remote-tracking branch 'google/release' into develop