o Removed some unnecessary debug output
Merge branch 'develop' into release