Merge branch '20190515' into 'master'
This tag has no release notes.