Merge branch '5.0'

Authored by brauch on Jul 9 2016, 12:47 PM.

Description

Merge branch '5.0'

Merged Changes

CommitAuthorDetailsCommitted
7cac941ea94fD2701brauch
Project controller: make displaying project config dialog async 
Jul 9 2016