Added the fix for STORE-301
Merge pull request #524 from Jedwondle/v1.2

Added the fix for STORE-301