Cc 215 merge

Merged in 2.15 (I think). Progress bar code was very messy to try to get merged.