master-bc-304

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