master-qa-3915

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