master-qa-5042

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