Merge branch 'GH-1415' of https://git.eclipse.org/r/www.eclipse.org/n4js into GH-1415