master-qa-3517-1

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