AUI-1477 - it looks like AUI-1177 was in the 2.5.0 tree: http://git.io/CGCwEQ