master-qa-12513

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