master-bc-424

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