Commit 0d2f6824ebf0bf9cb6c2bfb0ac9072d9dbb474c0

Patrick Steinhardt 2017-04-21T15:39:03

Merge pull request #4210 from pks-t/pks/misc-fixes Misc fixes