master-qa-3517-6

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