Removed last debug statements (I hope :D)
Merge branch 'sander'
Merge branch 'ferrybig'