Merge origin/master into floodfill_c