Merge remote-tracking branch 'origin/5.0'

Authored by kfunk on Jun 13 2016, 4:39 PM.

Description

Merge remote-tracking branch 'origin/5.0'

Merged Changes

CommitAuthorDetailsCommitted
c2dab122b6ecdhaumann/kfunk
Document Switcher: Include the frame width when setting the fixed size 
Jun 13 2016
424b041d0b60broulik/kfunk
[Run Controller] Use desktopFileName() instead of hardcoding a now wrong… 
Jun 13 2016
49d41d147ec9kfunk
Work around GCC bug in GCC 4.8 
Jun 13 2016