brianchandotcom/liferay-plugins — pull request #1262 by johnnyhowey (2013-01-18 20:11:23+00:00)
Title: SOS-1381 & SOS-1393

Please backport to 6.1.20