Integrates version 45

Was only using version 46. Put diffs in comments.