Merge remote-tracking branch 'origin/5.0'

Authored by kfunk.

Description

Merge remote-tracking branch 'origin/5.0'

Details

Merged Changes

CommitAuthorDetailsCommitted
bbca36945b8ekfunk
Adapt to kdevplatform changes 
Jan 8 2016