Merge branch '1904'

Authored by mardelle on Jun 13 2019, 6:00 AM.

Description

Merge branch '1904'

Merged Changes

CommitAuthorDetailsCommitted
334a58da7498mardelle
Fix monitor image hidden after style change Fixes #244 
Jun 13 2019
24b91d02187emardelle
Fix resize failure leaving clip at wrong size 
Jun 13 2019