This should make it easier on the sync to determine what changed and hopefully result in fewer merge conflicts that have to be manually resolved. 17d82afbfc
17d82afbfc