Fix serialization error when using Merge feature on a slave
Merge pull request #148 from lanfeust69/master

Fix serialization to slave
Merge branch 'master' into master_ialbors