Clipping fixed.
Merge branch 'master' into tom