master-bc-711

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