Merged with https://github.com/herrniemand/DFG