Merge commit '56c2f8ba9f88a5656cbdafb368abd72da1069709'

Authored by djarvie on Jul 4 2019, 10:36 PM.