Issue 1719 - Updated buildtools