Pull in Upstream Changes

Just updating our fork with the latest from upstream.