Merge branches 'janakj/mysql' and 'master' of ssh://janakj@git.sip-router.org/sip...