Fixed collision AND Jeff's spelling! It's a miracle!
Merge branch 'development' into hunt-mode