Sentinel support

Was #452.
Just stylistic: align `= :master` with the rest