Merge Jackpal into my HEAD