Merge branch 'master' into progress-indicators
Merge branch 'progress-indicators' into my-master
Added Eldon Ahrold to Credits.rtf.
Merge branch 'master' into my-master