fix for multistore config
Merge remote-tracking branch 'origin/mandrilldevel' into mandrilldevel