master-bc-429

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