Updated to Xtend 2.6.1