master-bc-373

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