master-qa-5946

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