777: Merge stable trunk into 2019.1 - Maintainer Requested
Authored by: octal450 2019-05-12
Parent: [r3958]
Child: [r3960]