http://issues.liferay.com/browse/LRDOCS-514

http://issues.liferay.com/browse/LRDOCS-514

Backport fix to 6.1.x