Merge remote-tracking branch 'origin/5.0'

Authored by kfunk on Aug 1 2016, 7:25 AM.

Description

Merge remote-tracking branch 'origin/5.0'

Merged Changes

CommitAuthorDetailsCommitted
38d6cd17fd37pino
i18n: make welcomepage plugin translatable 
Jul 31 2016
cb684c9d0aefD2312cordlandwehr
Fix assert due to non normalized indexed string 
Jul 30 2016