master-qa-4014

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