Merge branch 'Plasma/5.12' into Plasma/5.13

Authored by hein on May 24 2018, 11:42 AM.

Description

Merge branch 'Plasma/5.12' into Plasma/5.13

Merged Changes

CommitAuthorDetailsCommitted
664b90afcfd8D13073hein
Weigh matching services by relating data used in query to their menuids 
May 24 2018