Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
fixes issue #1940
add value comparison to test
fixes 1940 revised
fixed putAll backup operation & rename test
code clean up
Merge pull request #1948 from ahmetmircik/fix1940

Fixes issue #1940