master-bc-760

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