Reorder a test a little, fix spelling mistake
Merge remote-tracking branch 'origin/master' into pcl-version