Merge branch 'laforge/smpp'