Merge recent accepted commits from master to develop.