master-bc-354

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