Addresses #364 in 1.1.x branch.