brianchandotcom/liferay-plugins — pull request #1647 by johnnyhowey (2013-06-12 18:44:32+00:00)
Title: SOS-1497

Please backport to 6.1.x and 6.1.20