AUI-1667

Hey @ipeychev,

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

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