remove debugging output
Merge branch 'master' into devel