Merge branch '1804'

Authored by mardelle on Mar 27 2018, 7:17 AM.

Description

Merge branch '1804'

Merged Changes

CommitAuthorDetailsCommitted
42249e5007bamardelle
Fix lowres icons on highdpi patch by Andrew Crouthamel BUG: 390104 
Mar 27 2018