master-qa-6205

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