Merge branch 'master' into sebas/rotationplasmoid

Authored by sebas on Feb 23 2018, 11:21 AM.

Description

Merge branch 'master' into sebas/rotationplasmoid

Merged Changes

CommitAuthorDetailsCommitted
cd3b350e0225D10723sebas
hide primary display combo when not supported 
Feb 23 2018