Merge queue-reset branch to Asterisk