master-qa-8923

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