master-qa-8520

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