Merge tag '0.3.11' into develop

Released-0.3.11 0.3.11
bugfix when dealing with localized entries
bumped version
Merge branch 'release/0.3.12'