master-ll-11

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