Squash 1.0.62 update from Jackpal
Credit/Thanks to respective authors of these commits

Change-Id: I765f9aa0d26ea4ef015d2e0ffef2a4a9bb1cbf23