master-qa-5806

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