Recorded merge of revisions 397067 from http://svn.asterisk.org/svn/asterisk/branches/11