Merge tag '1.5.18' into develop

Finish 1.5.18
This commit is contained in:
Arin Alexander
2019-10-13 15:12:36 +03:00