Merged latest updates from the Eigen trunk.