Sync 331

Thanks @mseaton!
From this point down in the pull request, it is impossible to see what has changed.  Can you fix so that it only shows the changes?