master-bc-609

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