Added constructs to do tuple-merge policy.
Merge remote-tracking branch 'jdebrabant/master' into anticache