fixes bug 1064608 - CurrentProducts gets called too often
Merge pull request #2343 from peterbe/bug-1064608-currentproducts-gets-called-too-often

fixes bug 1064608 - CurrentProducts gets called too often