master-mh-292

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