bug 1019055; new marketplace 20140602
Merge pull request #19885 from clouserw/1019055

Bug 1019055; new marketplace 20140602, r=timdream