Upstream changes: 1.20 June 9, 2016 ! Minor kwalitee updates (@oeuftete) ! #106688 encode utf8 content in test which fails under RHES 6.6