Extra debug code removed.
Merge origin/master