AUI-1652

Hey @pei-jung,

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

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