Merge branch 'i18n-array-parser' into 0.3
(cherry picked from commit 57d3679a323a58abf54cc4c30ef5eebfd23a550c)