master-bc-310

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