Encoded polyline rebased to current svn-trunk branch