AUI-1165

Hey @mairatma,

Attached is an update for http://issues.liferay.com/browse/AUI-1165.  Can you review this soon as this is required for the Connect project which is due on Friday, Nov 5, 2014?

Please let me know if you have any questions.  Thanks!