Merge branch 'DLLEXPORT-fixes'

6 jobs for master
Status Name Job ID Coverage
  Test
passed clang-c++11 #3800
Linux

00:05:00

passed clang-c++98 #3802
Linux

00:04:20

passed gcc-c++11 #3799
Linux

00:05:32

passed gcc-c++98 #3801
Linux

00:04:36

passed macos-c++11 #3803
Apple

00:03:33

passed macos-c++98 #3804
Apple

00:04:35