backports-07012014

Hey @henvic,

Attached is an update for http://issues.liferay.com/browse/backports-07012014.

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