Missing change from 0e04023eb98fb4bdd922e511ec304600648b760c.
Merge branch 'v1.x' into gov-oneclickorgs-com