Fixed #781
Moved patch location :P
Merge remote-tracking branch 'origin/master' into MultiLanguage