Dev Guide Marketplace version updates

Please merge into 6.1.x.

The first commit is from a branch @jamesfalkner just submitted for the dev guide. Per 

James' request I'll merge into trunk as well.

I'll send you a pull for trunk as well. Thanks.