Merge in updates from the WhiteCore-Dev official repo.