master-qa-5612

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