Re-committing my version as tip of master.