master-qa-4950

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