Merge pull request #2157 from nnnick/fix/2156

Fix scale merge when the xAxes object is specified but the type is not