FWIW, I merged all the updates between trunk and the Convoy branch, so they should be in sync now. I forgot to do that a few months ago when I updated biscotti, and forgot I gave it the police strobe instead of regular strobe. 
Life has been a little too interesting lately.