Commits on Jul 28, 2019

  1. ped chat fix

    @Nick007J
    Nick007J committed Jul 28, 2019
    aac7acd

  2. Merge remote-tracking branch 'upstream/master'

    @Nick007J
    Nick007J committed Jul 28, 2019
    6c017fc