Set $mergeWithSaving in getRuleset() to true by default and add some tests
Fix merge conflicts
Merge branch 'barryvdh-patch-1' into develop