protobuf 2.5 is not yet available as ubuntu package therefore does not
work in travis. reverting to 2.4.1
Merge branch 'master' into 1.1