pulled down shared changes from james-release-1 into www