master-qa-11908

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