Contains master (the iOS build fixes) and the fix for the icon problem with iOS