Tried to fix problem with graph database not seeming to be flushed on initial create, by creating the graph database at a point where we can also shut it down afterwards
Merge remote-tracking branch 'origin/master'