Do not try to merge this branch. The only changes that are missing in the master are the following ones:
