Merged master and reverted old changes.