Removed debugging fragment
Merge conflict
Merge remote-tracking branch 'origin/sixpack' into talk-things

* origin/sixpack:
  Removed debugging fragment