Commits on Oct 26, 2020

  1. Merge in develop

    wlycdgr committed Oct 26, 2020