Commit 9d5f12ffd71958eb269af7f04d254e3cd6689f50

Carlos Martín Nieto 2016-12-12T22:43:11

Merge pull request #4018 from pks-t/pks/various-fixes Various fixes