master-bc-454

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