master-qa-6936

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