Commit e30a6ee378ebf6781c078608ee788fa784757579

Patrick Steinhardt 2017-03-20T11:06:23

Merge pull request #4160 from pks-t/pks/diff-fixes Diff fixes