Merge branch 'bug539492' of ssh://rarchevque@git.eclipse.org:29418/apogy/apogy into bug539492