Committing changes to merge with head.
QCed Ian's Whittle animation.