jonathanmccann/liferay-portal — pull request #555 by ssmith353 (2014-12-10 19:23:44+00:00)
Title: LPS-52136

This logic is nearly identical to that of [LPS-51509](https://github.com/brianchandotcom/liferay-plugins/pull/3997)