Changed: Tidy up following merge from 1.3.x branch.