rebased onto master

This resolves the 2 lines that wont merge properly in the future.