Merge remote-tracking branch 'origin/master'
authorJoshua Rüsweg <josh@bastelstu.be>
Mon, 19 Jun 2017 21:03:27 +0000 (23:03 +0200)
committerJoshua Rüsweg <josh@bastelstu.be>
Mon, 19 Jun 2017 21:03:27 +0000 (23:03 +0200)

Trivial merge