Fix for translations
Merge branch 'user' into develop
Merge branch 'user' into develop
Merge branch 'develop' into user
Merge branch 'user' of https://github.com/pi-engine/pi into user
Fix for uclient data access