Recorded merge of revisions 368721 from http://svn.asterisk.org/svn/asterisk/branches/10