Merge branch 'trunk' into 'master'

    - echo "${CI_SERVER_PROTOCOL}://${GIT_PUSH_LOGIN}:${GIT_PUSH_PASSWORD}@${CI_SERVER_HOST}" >> ~/.git-credentials || true

    - ( test -n "${GIT_LOGIN}" && test -n "${GIT_PASSWORD}" ) && echo "https://${GIT_LOGIN}:${GIT_PASSWORD}@$(echo ${GIT_URL} | sed -r 's#([^/])/[^/].*#\1#' | sed -e 's|https://||g')" >> ~/.git-credentials || true

    - ( eval $(ssh-agent -s); echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null && mkdir -p ~/.ssh && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config ) || true

    - git checkout --track origin/master && git pull

    - git remote add upstream "${GIT_URL}" && git fetch upstream

    - git checkout --track origin/master && git merge upstream/"${GIT_UPSTGREAM_BRANCH}"

    - git pull "upstream/${GIT_UPSTGREAM_BRANCH}"

    - echo -e "machine ${CI_SERVER_HOST}\nlogin ${GIT_PUSH_LOGIN}\npassword ${GIT_PUSH_PASSWORD}" > ~/.netrc

    - git push