Merge remote-tracking branch 'origin/5.0'

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

Description

Merge remote-tracking branch 'origin/5.0'

Merged Changes

CommitAuthorDetailsCommitted
8819102476f4D2321ltoscano
Unify i18n strings from QML to allow extraction 
Aug 1 2016