master-bc-464

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