Merge branch 'master' of ssh://jkaufman@git.eclipse.org:29418/www.eclipse.org/stem.git

Signed-off-by: James Kaufman <jhkauf@us.ibm.com>