Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
[#190] Bump version number
[#190] Update translated strings
[#190] Update French strings
Merge branch 'release/2.0.4' into develop
Merge branch 'release/2.0.4'
Merge branch 'master' into develop