AUI-1587

Hey @mairatma,

Attached is an update for http://issues.liferay.com/browse/AUI-1587.

Please let me know if you have any questions.  Thanks!