Many error messages with SVN-trunk-r60363

Just upgraded… Now have a lot of error messages like this:

[Apr  6 15:22:15] WARNING[14838]: chan_sip.c:16857 build_peer: Ignoring unknown option 'userbase' at line 12 of sip.conf!
[Apr  6 15:22:15] WARNING[14838]: chan_sip.c:16857 build_peer: Ignoring unknown option 'hasvoicemail' at line 16 of sip.conf!
[Apr  6 15:22:15] WARNING[14838]: chan_sip.c:16857 build_peer: Ignoring unknown option 'hassip' at line 20 of sip.conf!
[Apr  6 15:22:15] WARNING[14838]: chan_sip.c:16857 build_peer: Ignoring unknown option 'hasiax' at line 24 of sip.conf!
[Apr  6 15:22:15] WARNING[14838]: chan_sip.c:16857 build_peer: Ignoring unknown option 'hasmanager' at line 32 of sip.conf!
[Apr  6 15:22:15] WARNING[14838]: chan_sip.c:16857 build_peer: Ignoring unknown option 'callwaiting' at line 36 of sip.conf!
[Apr  6 15:22:15] WARNING[14838]: chan_sip.c:16857 build_peer: Ignoring unknown option 'threewaycalling' at line 37 of sip.conf!
[Apr  6 15:22:15] WARNING[14838]: chan_sip.c:16857 build_peer: Ignoring unknown option 'callwaitingcallerid' at line 38 of sip.conf!
[Apr  6 15:22:15] WARNING[14838]: chan_sip.c:16857 build_peer: Ignoring unknown option 'transfer' at line 39 of sip.conf!
[Apr  6 15:22:15] WARNING[14838]: chan_sip.c:16857 build_peer: Ignoring unknown option 'canpark' at line 40 of sip.conf!
[Apr  6 15:22:15] WARNING[14838]: chan_sip.c:16857 build_peer: Ignoring unknown option 'cancallforward' at line 41 of sip.conf!
[Apr  6 15:22:15] WARNING[14838]: chan_sip.c:16857 build_peer: Ignoring unknown option 'callreturn' at line 42 of sip.conf!
[Apr  6 15:22:15] WARNING[14838]: chan_sip.c:16857 build_peer: Ignoring unknown option 'localextenlength' at line 45 of sip.conf!
[Apr  6 15:22:15] WARNING[14838]: chan_sip.c:16857 build_peer: Ignoring unknown option 'vmsecret' at line 54 of sip.conf!
[Apr  6 15:22:15] WARNING[14838]: chan_sip.c:16857 build_peer: Ignoring unknown option 'hasvoicemail' at line 55 of sip.conf!
[Apr  6 15:22:15] WARNING[14838]: chan_sip.c:16857 build_peer: Ignoring unknown option 'hassip' at line 56 of sip.conf!
[Apr  6 15:22:15] WARNING[14838]: chan_sip.c:16857 build_peer: Ignoring unknown option 'userbase' at line 12 of sip.conf!
[Apr  6 15:22:15] WARNING[14838]: chan_sip.c:16857 build_peer: Ignoring unknown option 'hasvoicemail' at line 16 of sip.conf!

… and so on. I’ve made no changes to my config files since the previous build. And I have my peers configured in users.conf, not sip.conf