master-bc-615

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