Pull now or forever hold your peace

Pulling in all of the last changes into the primary repository.