Merge today's branch with master.