Pulling in some recent Photon updates.