wired the shortname to make sure it's always set
Merge branch 'master' of github.com:web2project/web2project
Merge branch 'v3.1-object-cleanup' into version3.1-core-development