master-qa-9042

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