master-qa-2922

http://issues.liferay.com/LIFERAYQA-2922