master-bc-273

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