master-qa-5810

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