Merge remote-tracking branch 'origin/master' into service-twitter
authorMichael Winsauer <e1429715@student.tuwien.ac.at>
Sun, 4 Nov 2018 15:28:51 +0000 (16:28 +0100)
committerMichael Winsauer <e1429715@student.tuwien.ac.at>
Sun, 4 Nov 2018 15:28:51 +0000 (16:28 +0100)

Trivial merge