Synchronising duet branch with the mastr branch.