master-bc-484

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