Bug 1045658, Bug 1042148 - update copy & links
Merge branch 'develop'