Merge branch 'release/1.2.5' into develop
tdd: changed merge() behavior
fixes #2
Merge branch 'feature/fix-merge-params' into develop
ver 1.3.0
Merge branch 'release/1.3.0'