Updated to 2.6.1 and added codeserver