master-qa-master

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