Merging changes from trunk into stable branch