master-qa-5962

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