Merge remote-tracking branch 'ivan/bug/4000_support-non-ascii' into develop
authorTomás Touceda <chiiph@leap.se>
Wed, 23 Oct 2013 14:30:05 +0000 (11:30 -0300)
committerTomás Touceda <chiiph@leap.se>
Wed, 23 Oct 2013 14:30:05 +0000 (11:30 -0300)

Trivial merge