I was able to build your branch with your last commit and w/o it. If that works for you, please let me know, I'll make a release with the fix.
I confirm it now works like a charm: I can build my patches for WF 12 and 13. Thanks for the quick fix.
Looking forward to the release.
Thanks!
--
Guillaume