Fixed a bug which was caused by me thinking I was fixing a bug that wasn't a bug.
Merge branch 'sander'
Merge branch 'ferrybig'