Copied over changes made in master to the branch