Merge hot-fixes from master.