master-qa-9520

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