Incorporate patches from joel's branch for boost-1.56