Merge branch 'Plasma/5.8'

Authored by drosca on Jan 10 2017, 7:00 PM.

Description

Merge branch 'Plasma/5.8'

Merged Changes

CommitAuthorDetailsCommitted
b2c6aa5b3499D3904drosca
MediaController: Update position while queuedPositionUpdate timer is running 
Jan 10 2017
19a88030d3deD3981mart
better clean up of duplicate containments 
Jan 10 2017