Merge pull request #860 from MrPetovan/2019.06-rc