15x-1522

Hey @natecavanaugh,

Attached is an update for http://issues.liferay.com/browse/15x-1522.

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