Fix db connection problem (encoding)
Merge remote-tracking branch 'origin/master'