Today is not my day for writing code that compiles.
........

Merged revisions 406327 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: http://svn.asterisk.org/svn/asterisk/trunk@406328 f38db490-d61c-443f-a65b-d21fe96a405b