master-qa-12105

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