Take master cpp-common
Take master cpp-common
Merge pull request #142 from Metaswitch/cpp-common-overload

[No review required] Take master cpp-common