Pre dcommit
Merge branch 'master' of https://github.com/dkgroot/chan-sccp-b_test