Merging commits from last night and this morning.