test: add change in upstream textfile
Merge branch 'master' of https://github.com/luminize/upstream into upstream-branch
Merge branch 'master' into subtree-branch
test: add info that I need to merge master instead of rebase onto it ;)