(Imported from upstream's 08b172b975bcd5854f9201b9f89d05dc330adb79)
This change fixes a number of build warnings.
Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)