master-bc-674

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