I unfortunately merged in the wrong order, so there is now a conflict in .gitignore which prevents me from merging @carlw's sample. Will try to untangle it later.