Merge pull request #7 from fabric-engine/rivera-persist-broken-graphs

Rivera persist broken graphs
Merge remote-tracking branch 'origin/rivera' into picasso