master-bc-675

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