Action Animation merged with upstream master.