Fixed #202: Fixed decoding of modified UTF7
Merge remote-tracking branch 'upstream/master'