Changes for Asterisk TRUNK r357721