GH #265 - Removed debug statements.
Merge branch 'master' into support/2.0