Cherry picking some fixes to the store URL. See upstream commits 0c284fb (May 20, 2014) and dc3f924 (May 22, 2014) in reference to github issue/pull-request #176.