I see you pulled in my changes already.  I _think_ this file in master should actually just work now with your branch.  Do you mind "merging" with master first?  (meaning replacement and checking if anything broke?)