master-bc-670

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