removing cruft
Merge branch 'master' into devel-pk