Updating build tools version
Merge remote-tracking branch 'antox/master'