Merge "Remove ImageActor usage from programming guide" into devel/master