master-bc-523

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