Changes like this should be done in a separate pull request into master in future.