6.1.x Marketplace version updates

Here is a change from @jamesfalkner for Marketplace. Thanks.