Merge pull request #643 from jslachta/asterisk.18.4.0