pull-request-951

Hey @natecavanaugh,

Attached is an update for http://issues.liferay.com/browse/pull-request-951.

Please let me know if you have any questions.  Thanks!