Merge "Remove trailing spaces from JSON dump"