Use the new header with PCL 1.7.0+
Merge branch 'master' into patch-1