AUI-1748

Hey @mairatma,

Attached is an update for https://issues.liferay.com/browse/AUI-1748.

Please let me know if you have any questions.  Thanks!