Importing upstream fix https://github.com/PointCloudLibrary/pcl/pull/165