Handling fields which are too long. Looks like we were truncating data anyway!
Merge remote-tracking branch 'origin/master'