Fix protobuf S10 build
Merge branch 'master' of git.everycity.co.uk:everycity/ec-userland