Merge osmdroid r1365