merge stuff from unstable in

Authored by jriddell on Oct 15 2019, 11:01 AM.

Description

merge stuff from unstable in

Details

Committed
jriddellOct 15 2019, 11:01 AM
Parents
R577:970068c646f0: fix logic to not break when running
Branches
Unknown
Tags
Unknown