Merge branch 'proj4-pthreads' into release

Change-Id: I6a4fef51ca87fa256fc33ef6919b9bea4dbc3e9b
Merge branch 'release'

Change-Id: I20c684c0151ea7dab1575d003b40b78e5da2b809