master-ll-12

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