cd src

git checkout master

git fetch upstream
git merge upstream/master

git branch -D build
git checkout -b build

git fetch upstream pull/14122/head:stopwatch
git merge stopwatch

git merge fix_commit_status_index