Merge branch 'release-0.85'
removed link from market
Merge branch 'hotfixmarket' into develop