Merge branch 'fixDoubleSwap' into 'master'

Fix double swap



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

00:27:05

passed #4069
Linux
clang-c++98

00:15:13

passed #4066
Linux
gcc-c++11

00:04:33

passed #4068
Linux
gcc-c++98

00:04:08

passed #4070
Apple
macos-c++11

00:15:11

passed #4071
Apple
macos-c++98

00:16:02