Merge branch 'master' into telegps-v0.3