Merge "Removed reference to nonexistent file in g_helix." into release-4-6