Update for 1.5. See README for more info.