- cleanup
Merge remote-tracking branch 'upstream/master'

Merge client & server branches
Merge remote-tracking branch 'upstream/master'

Another merge
Merge branch 'master' of https://github.com/michalbe/loremipsum

Another merge