master-qa-5322

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