Removed debug outputs
Merge branch 'master' into upstreammerge