Moved changes from master branch over.