deleted the bidirectional stuff
deleted the bidirectional stuff
_
Merge remote-tracking branch 'upstream/master'