Merges recent changes into master branch