Merge remote-tracking branch 'remotes/upstream/master' into sockeye
authorDaniel Schwyn <schwyda@student.ethz.ch>
Tue, 26 Sep 2017 13:49:15 +0000 (15:49 +0200)
committerDaniel Schwyn <schwyda@student.ethz.ch>
Tue, 26 Sep 2017 13:49:33 +0000 (15:49 +0200)
Signed-off-by: Daniel Schwyn <schwyda@student.ethz.ch>


Trivial merge