When using FastLED 3.1 I get this error when compiling even the simplest blink

When using FastLED 3.1 I get this error when compiling even the simplest blink code.

Arduino: 1.6.1 (Windows 7), Board: “Arduino Mega or Mega 2560, ATmega2560 (Mega 2560)”

In file included from C:\Program Files (x86)\Arduino\libraries\FastLED/pixeltypes.h:6:0,

             from C:\Program Files (x86)\Arduino\libraries\FastLED/controller.h:5,

             from C:\Program Files (x86)\Arduino\libraries\FastLED/FastLED.h:37,

             from Blink.ino:1:

C:\Program Files (x86)\Arduino\libraries\FastLED/color.h:9:1: error: expected unqualified-id before ‘>>’ token

c0c8f765f1b01655116cc0c95979203ba05c80ef

^

C:\Program Files (x86)\Arduino\libraries\FastLED/color.h:29:3: error: ‘LEDColorCorrection’ does not name a type

} LEDColorCorrection;

^

In file included from C:\Program Files (x86)\Arduino\libraries\FastLED/controller.h:5:0,

             from C:\Program Files (x86)\Arduino\libraries\FastLED/FastLED.h:37,

             from Blink.ino:1:

C:\Program Files (x86)\Arduino\libraries\FastLED/pixeltypes.h:129:37: error: expected ‘)’ before ‘colorcode’

 inline CRGB( LEDColorCorrection colorcode) <i>_attribute_</i>((always_inline))

                                 ^

In file included from C:\Program Files (x86)\Arduino\libraries\FastLED/FastLED.h:37:0,

             from Blink.ino:1:

C:\Program Files (x86)\Arduino\libraries\FastLED/controller.h:140:22: error: expected ‘;’ at end of member declaration

 CLEDController & setCorrection(LEDColorCorrection correction) { m_ColorCorrection = correction; return *this; }

                  ^

C:\Program Files (x86)\Arduino\libraries\FastLED/controller.h:140:36: error: ‘CLEDController& CLEDController::setCorrection’ conflicts with a previous declaration

 CLEDController & setCorrection(LEDColorCorrection correction) { m_ColorCorrection = correction; return *this; }

                                ^

C:\Program Files (x86)\Arduino\libraries\FastLED/controller.h:138:22: note: previous declaration ‘CLEDController& CLEDController::setCorrection(CRGB)’

 CLEDController & setCorrection(CRGB correction) { m_ColorCorrection = correction; return *this; }

                  ^

C:\Program Files (x86)\Arduino\libraries\FastLED/controller.h:140:55: error: expected ‘)’ before ‘correction’

 CLEDController & setCorrection(LEDColorCorrection correction) { m_ColorCorrection = correction; return *this; }

                                                   ^

C:\Program Files (x86)\Arduino\libraries\FastLED/controller.h: In constructor ‘CLEDController::CLEDController()’:

C:\Program Files (x86)\Arduino\libraries\FastLED/controller.h:64:56: error: ‘UncorrectedColor’ was not declared in this scope

 CLEDController() : m_Data(NULL), m_ColorCorrection(UncorrectedColor), m_ColorTemperature(UncorrectedTemperature), m_DitherMode(BINARY_DITHER), m_nLeds(0) {

                                                    ^

Error compiling.

This report would have more information with
“Show verbose output during compilation”
enabled in File > Preferences.

There was a bad checkin earlier this week - I’ve pulled the fixes over now, re-get the code.