master-bc-499

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