Merged Wiki/Weather commit changes