Merge in latest from MylesCord