master-bc-486

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