master-bc-371

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