Merge pull request #3384 from ster/develop

issue #2349 : Page caching with querystring