http://issues.liferay.com/browse/LIFERAYQA-3260

master-bc-259