Merge pull request #243 from micmac1/asterisk-fixes-for-15.05