remove debug code
Merge branch 'master' into RELEASE_20130723