Android port 1.10.7-18b update from Alessandro Pira