master-bc-333

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