Merge pull request #658 from dangowrt/asterisk-18.5.0