Take master cpp-common
Merge remote-tracking branch 'origin/master' into update_cppc
Merge pull request #77 from Metaswitch/update_cppc

Take master cpp-common