9 Days Ago
merge from fogmethod1 (sky branch)