Fixed Marshaller::merge() when passing data that needs to be converted
Merge pull request #3347 from cakephp/3.0-marshaller-fix

3.0 marshaller fix