jonathanmccann/liferay-portal — pull request #210 by BryanEngler (2014-03-05 17:47:11+00:00)
Title: LPS-44246 and LPS-44090

sending this again after having a conversation with hugo and mhan