Action Animation merged with upstream master.

Action Animation merged with upstream master.