Merge trunk into branch "3d-affine-transforms"