master-qa-5322-1

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