Changed to not open multiple tabs of the same file
Merged with master