Refs #4338 Renaming menu to "Marketplace" since that's what the best name for it so far!
Merge remote-tracking branch 'origin/master'