Updated core update changes to match master.

Changed files to match closer to the master branch of the Git this was
forked from.