Updated to match the state machine.
Merge remote-tracking branch 'origin/master'