There was a conflict in the branch so I'm not entirely sure if it's correct, but I seem to get a 'line too long' on this line ( it was  line 691 after merge )