AUI-1576

Hey @drewbrokke,

Attached is an update for http://issues.liferay.com/browse/AUI-1576.

Can we write a unit test for this fix?  We will submit the update and unit together even though they will be against different AUI tickets. 

Please let me know if you have any questions.  Thanks!