Updated to match 2.6.6 release (which occurred on a branch).