master-bc-358

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