Merge commit 'a3940fff3759f59e6bc01e606581fe944a3bb29b'

Authored by djarvie on May 23 2019, 9:52 PM.