Merge branch 'fixDoubleSwap' into 'master'

Fix double swap



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

00:27:05

passed clang-c++98 #4069
Linux

00:15:13

passed gcc-c++11 #4066
Linux

00:04:33

passed gcc-c++98 #4068
Linux

00:04:08

passed macos-c++11 #4070
Apple

00:15:11

passed macos-c++98 #4071
Apple

00:16:02