brianchandotcom/liferay-plugins — pull request #1268 by johnnyhowey (2013-01-22 19:15:04+00:00)
Title: SOS-1314 & SOS-1394

Please backport to 6.1.20