Merge branch 'VS2015-fixes' into 'master'

Fix internal compiler error on VS2015



See merge request !56
6 jobs for master
Status Job ID Name Coverage
  Test
passed clang-c++11 #4426
Linux

00:22:18

passed clang-c++98 #4428
Linux

00:16:22

passed gcc-c++11 #4425
Linux

00:04:18

passed gcc-c++98 #4427
Linux

00:25:04

passed macos-c++11 #4429
Apple

00:08:56

passed macos-c++98 #4430
Apple

00:14:12