- up to 2.5.2 + git fixes