Add field_key to parameter list for hook_assemble_form_state_into_field().
Merge branch '7.x-1.x' of github.com:signalpoint/date into 7.x-1.x